Merge from trunk
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Feb 2012 15:53:59 +0000 (07:53 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Feb 2012 15:53:59 +0000 (07:53 -0800)
commit1b489f0e733023afaff629746f2d4cb75d8ada68
tree8e6e784ce26a9353249a710e0ea6b9b2907ba8fc
parent60cf971dcb8794d53d6472324934eb804e43072c
parentdd3fa0733e4bc9ffcc80506075191459e14487bf
Merge from trunk